ActionFinish refactor fix commit

This commit wraps up the changes to `action-set` now that ActionFinish
has landed in core.