Lose command index enum in favour of runtime-calculated index.

18 files changed