Last big commit before blang overhaul.