Changes to parsing and scoping.