Intermediate commit on compiler typing cleanup