PR Fixup: Make helper more generic and add comment