More cases in mishap.hpp missed - should be a template function.