Finish migration to Jackson 2.4.
Clean up some broken Jackson 2 stuff.