Some follow-on cleanup from my previous work.

Merge request reports