PR fixup: limit splitting where desired