[#2250] Tiny refactoring per merge request review.