Use less magic, at the cost of relative path failures.
Adding more builtins, making more tests green.