Move type vectorisation code to a separate module