Simplify composite index construction somewhat