Got rid of type origins. A-maaazing!