More work on OreScannerModule.