Clean up EXTENDED_ARG handling and partially fix the MAKE_FUNCTION which uses it