reduce unneeded object creation (garbage)

While going through other tasks, do some cleanups to reduce unneeded object creation, to reduce the load on the gc. This is minor, and would not probably be worth doing, unless there were other reasons for visiting these modules.