Scott simplifications and ambiguity handling changes.
Scott simplifications and ambiguity handling changes.