CQM module: More interim work on the cqm rules.