Get rid of NamedFieldPuns to keep things simple