Clean up of BlameTreeAnalysis and further adjusted so it compiles