As a follow-up to JDK-8345250, I started refactoring the code to better understand it. I split it off JDK-8345250 to minimize the risk and better understand what changes are pure refactoring and which one are actual semantic changes.

This RFE should only do semantically preserving refactorings.