Simplify parser slightly

This just shortens some code to improve clarity and succintness.