Make adding more types simpler in the Registry.
Merge pull request #1923 from rwjblue/make-registry-easier

Make adding more types simpler in the Registry.