Fixing use of CustomMeleeGroups to split into its two actual components:
Fundamental changes in form (to be applied in set construction at the
beginning), and transitory customizations (to be applied in set construction
at the end).
The form value is kept in state.CombatForm (single value, not a list).
Also, changed TPWeapon to state.CombatWeapon.