ENG-5128: A couple of minor elastic hashinator changes.