Prefer instanceof check to flag. Remove redundant was method and inline call-site
Merge branch 'master' of https://github.com/kjgorman/489-uhc