Refactor Action, per new names.ActionTag changes...

... and to improve internal structure.
This makes me think that perhaps the state.Unit should have a method that returns a UnitTag, so other people don't have to do type casts.