Here's some no-semantic-change cleanup: