Adding state for inc/dec, and dropped reserved words map