Move action step stuff to BaseAction.