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

... and to improve internal structure.