Unified builtins2

to help improve performance or to make sure the constraint has been simplified before pattern expansion?