Refactored analyzers and drivers.