Updated analyzer detection code

https://www.pivotaltracker.com/story/show/79455146