Refactor argument adjustment on converter