issue #24098: cleanup from code review