Huge number of bits and bobs to get new DictManager working.

Moved EnumCombos to their own file.

--CAR and BRJ