Fixes: Make references to Analyzer parametrized