Rewrite existing code to use HasActions

And fix a bug in the initial use case where mod.action was dropped.