Housecleaning and variable additions.