Improve ... checking logic for 3e expect_error() (and friends)

Improve ... checking logic for 3e expect_error() (and friends) #1420