validateIndentation: simplify line annotation data structure
validateIndentation: Allow non-indented "break" in "switch" statement

Fixes gh-550
Closes gh-568