and make the two categories of constants non-overlapping, we
really don't need to risk confusion in order to save 6 bits in
a data structure like this.

Change-Id: I2251195d8e45ed04e2a89e47ae9c3e52cf0475c0