Code style fixes
ModeParser{,Test}: fix logic error; prepare next step