Resolved #137: Unified states into stages

We are removing states. For completed, dropped, or postponed states we
now use completed, dropped, and delayed stages.