More for #262

* Change/Add some more comments in for Ambiguous
* Remove some comments added as it appears they have been identified.
* Unified what comments I found that I added for 264.

Applies to #264 as well