Requests for comment/Linker class refactor