Minor parsing adjustments.