Lexer: Remove special tags for if / else closing; update tag symbol names