ClosureExtractor can be made final.
Rewrote grammar so that everything is an expression (no more statements).
Switch to jUnit 4.11
Simplified the grammar even more (though it breaks block scope)