Improved disambiguator.  Addressed some pylint issues.