Code review fix per #3125.