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

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