Add handling of $-substitutions to lexer