If option "caa_approved_only" is set, skip non-approved images asap.

Minor cleanup.