Reorganized code for new argument weaving features