Tweaks to syntax analysis and supporting classes
Refactorings to move towards Closure-independence