Tidy up syntax errors in Lexer and HIRB.