Work towards unambiguity.

This is going to take a looong time, and it may not really be worth it.