Unified builtins2

I decided to do the same commit on unified-builtins2 separately and then merge afterwards, rather than trying to merge before Andrei's change is merged.

@andreistefanescu please review again.