Fix type of tokens passed to cb's to ensure they are arrays.

* Local RT testing emitted warnings about non-array tokens being
  received from parser functions code.

* Fixed up a few sites that were the source of warnings.

* No change in parser test results.

Change-Id: I74dcb68dc4fba2ee0582769b400afb9434cbc8c9
Merge "Fix type of tokens passed to cb's to ensure they are arrays."