More OreScanner work.