Make risk maps work with refactored result collector.