Merge pull request #2675 from alex/further-reduce-duplication

Attempt to further reduce dependecy duplication