Patching a few more holes around whitespace and END states