Clarify parser a little; cleanup some refs/baseline magic constants