Fix conditional subchecks.