Fix React's complaints about non-unique keys etc.