language is a battlefield. good to see some semantic refactoring in progress.