Minor parsing fixes.