Greatly simplify definition keys.