More deprecation fixes for `{{action}}`