A insertion works swimmingly, and other classes have been cleaned further.