More formatting...not sure how much this is helping, though :-(
Changing the order of type token creation