Fixup formatting in the pass.
Revert r209381 as it isn't a local variable. Add a testcase so that
we know next time this happens.