CRM-15527 minor tidyup since = False is never returned