add AmbiguousPromotedFields, remove likely unneeded ambiguity kinds
slightly improve ambiguity diag for promoted fields