Added return values for non-builtin functions (oops)