move some stuff around so the parser can see the subtype