Fix Trac #2756: CorePrep strictness bug