Fix a bunch of custom-inserter functions to handle the case where