#48, #42: Finalize support for multi-module reports.