A few type fixes for ATNSerializer.