move 1722a subtype functions to be near other subtype functions