When I pushed JDK-8224816, I did not push the final webrev, which had some suggested refactorings. This RFE is basically about adding on those incremental refactorings, which have already been reviewed.