Unified builtins2

then maybe it's better to move it into expandPatterns?