Add @huonw's ambiguity solution to Alternatives