Fix regressions introduced with 1d31704e

I should run my tests!
Track upstream of Catch