Added insert-as-argument(...) and mod-replace(...)