I tried to move complexity out of `rebuild_ty`... I'll try to clean up these two invocations.