...after 8ee69b0b changed it from using integers
with special interpretation to self-explaining data structures.

Change-Id: Ib05dbde969fedcfb5f8c55a926bfef4120e38030