Move type-waxing into issue