[reader] Minor cleanup of get-token
[reader] Refactor skip-multi-line-comment to not require a <lexer>, for ease of testing.