Refactoring prior to fixing https://bz.apache.org/bugzilla/show_bug.cgi?id=58660 No functional change