keys: Be more consistent in selection of union members used