Rest of update to Jackson 2.x