minor tweaks to speed parsing