Cleaning up some incomplete type trait induction