Major types rewriting to improve routing.