Updated Rewrite_Utility.cpp and Rewrite_Utility.hpp to include useful functions and bug fixes from the p1transform versions.


Former-commit-id: 9b7ffb89de8bb412af3afdcddc547e906ed00c94