FLOE-194: More code improvements for bindDialog component.