Type don't track location anymore
Introduce cannonical type.