Declare keys in comound indexes in group then name order. Also fix use of Keys constants.