More tweaks to parser ...