Move MeetsUsabilityRequirement() check to correct block