Minor impromevents in comments etc.; no behavior changes