Modifying builtins to fit with the conditionals system