Clean-up in parser. ClauseNode rework, plus internal adjustments to reduce extra code and unchecked casts.