More changes to facilitate my cleanup.