Minor tweaks in EnhancedScanner constructor.