ENG-4432: Improve fix readability per Izzy's review comment.