Small cleanup after merges.