Code cleanup. No real changes.