Fix block autocorrect clash

Another refactoring from Ripper style to Parser style, which made the correction easier, and then the correction.

Fixes #638.