ERT-530: Minor fallout after merge.