Combine Q rules in parser.

Don't need two separate rules for the same function.