More work on the analyzer framework.