Switch to rivet builtin functions