Don't aggressively wrap SUBTYPEs - leave as before