Simplify parser methods a bit