Comment cleanup in progress. Interim checkin.