Updated SchemeScanner.