As a follow-up to JDK-8299896 we found that there is more opportunity for cleaning up and simplifying the LinkFactory code, including using fluent setters instead of public fields and simplifying the class hierarchy.