Rewrite arg insertion to be not dumb