gh-136: review fixes, remove an unnecessary state variable.