I don't know if this should be part of the same patch or a new patch, but maybe (along the same lines) the variable names used in the "checkfortars()" function should use the same "module" and "component" pattern as all the other functions, instead of "M" and "C"?