Added USE_NOISY_TRACE_IN_THIS_MODULE_ support to a couple modules