Minor code simplification

The following invariant holds for dist_t class:

  !more -> active == eligible

This change removes unnecessary swap operation and adds an assertion
to check that invariant.