Stop highlighting keywords in arguments.

Was highlighting 'and' & 'exit' in the string:
"foo-and-exit".

Fixed by updating the syntax table to set '-' as part of a word rather
than punctuation.
Tests expect a tab width of 4 spaces.
Simplify tests. Just try to get simplest indent working.
Clean up. Remove unused variables.