Moving some parser rules