Some cleanup, some further work on analyzers