Fix typos in r31260

Also added some missing values and sentinels.

cmr=v1.8:ticket=#4470