First, provisional, version of analyzer
style changes