Ensure we add the builtin types to arbitrarily generated schemas.