cbmc build: twiddled with vars definitions.