Reorganized NormalMode amiguity handling. Fixes #95.
Keep an eye on this one--it passes tests, but it may have introduced very
subtle unexpected parse behavior (like the bug it's fixing).