Remove x?[i] operator and clean up lexer