OO dispatch instead of util helper function according to CR-SCL-37