Remove bogus creates/updates of state file.

Enhance await strategy and logging. This version is functional. Prior trouble
may be related to a flaky disk. It is unclear and there will be more testing.