Clean up ExecutionReportBuilder implementations.
Fix replace bug in order match