Some small cleanup as well as a fix to capx_cfe_load_by_machine_name to add type to the params