Extract AssignableExpr and LiteralExpr to top-level
Extract UntypedExpr to top-level
Extract DefExpr to top-level
Remove commented out code
Change the version number for testing