Tidy up before adding Gen1 implicits, part 3