Made the base analyzer more modular.