parser: Improve grammar on tuple handling