Stage one in removing the code for old-style observes

Mostly things are now based in observeChanges.  There are still probably
a few places to remove old observe from.