Cleanup after merge: remove some duplicate code / comments.