Improve some of the easier-to-test failure code paths.