Re #396: Do not link EDM fields in certain contexts