Reorganizing the implementation of routines for manipulating single entries