a few cleanups that came out of the source cache work

Just some cleanups - no behavior changes.