[OTR] Small code refactoring.