disambiguate.py style fixes