More limited check extension in non-PV nodes

(Was intended in case Uri-Marco patch would not pass but can't hurt to try this.)