Move more type maps.
Move more glb/lub helpers