Yes, I think they should be in external_variables.  I also added host_or_hostgroup_smart_class_parameters and puppet_smart_class_parameters.  Why do you not think they should be included in external_variables?