Catch all E121 cases in a single pass

This speeds things up and fixes #90.