Updated nrefactory/speeded up code analysis.