Tiny bit of clean up for obsolete references in comments etc.