Rearranged entries in the Type Checker
Merge remote-tracking branch 'origin/master'