Further cleans up. Matches closely with Apex, PHP, and Python