nul-terminate the token in the output XML and a couple of
  cleanups for determining structure sizes.