HoleEdit reorganization and Sugar.mUnwrap move into arg