ADD_APPEND_ARGS A few cleanups