Fix the grammars for data statement parts and add tests.