Working on [JACKSON-347], rearranging type codes to allow efficient skipping

6 files changed