Convention fixes (and preventing a potential bad ambiguity error.