make the derived fields code a bit more DRY and change the indicator for a name being a map-family qualifier to it not having a colon and ending in _qualifier_