Now that JDK8 is our minimum target and our standard constraints support TYPE_USE, we can remove the precautions we took with TYPE_USE.