Continuing rework on SiRF parser