@schinkelg ran aground of this one and I took the opportunity to add a test to catch this sort of thing for next time.