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

... and to improve internal structure.
It's mainly important to create ActionTags with... I suppose that qualifies as important enough to store?