Improve coverage

At one point it was consistency vs escaping... I went with consistency, but, yes, I see your point.