Removing the notion that -1 was a special state value. The code was changed a while back to have properly defined states. Helps prepare for LANG-478