Refactoring not to rely on being same package as Jackson annotation stuff; prepare for 2.3.0-rc1