Do extra checking for choice rules so that they don't interfere with package splits