This is similar to what I did earlier for calc.  This info will be
used later in the type detection code.

Change-Id: I7ba7dcdc03cbfe77eba5c7594fc0385ad3775541