Misc refactoring to eventually support #313, filtering of container types.
Merge branch 'master' of github.com:FasterXML/jackson-databind