Removed explicit insert from a number of refactorings.