Fix another fallout from testing merge.