Make better use of Catch facilities