Cleaning up some local vs global variable scoping problems for multi-objects.