Fixup some "Demeter's Law" violations

Just a step toward minimizing the amount of code that has to know about the details of any given object's interface.