Re-factor parsing of the Linearization dictionary
Merge pull request #5023 from Snuffleupagus/linearization-refactor

Re-factor parsing of the Linearization dictionary