Some more cleanup. No functional changes.