Tweak rules for expressions in port/generic maps