Added C++ arguments refactoring utilities