Minor cleanup after merging #1712