A little better support for tracing from within the CM files