* [DH_CYCLE,FIX] Rewrote number-of-cycles infrastructure.
* [DH_NAV,FIX] Rewrote number-of-steps infrastructure.