CBC 420.6 - R2.1 smoke barriers - is occ load determinative?

[Yikes]

Does CBC 420.6 require smoke barriers and two smoke compartments only when the R-2.1 occupant load exceeds 50?

Please read CBC 420.6 below. The comma placement (or lack thereof) is confusing me. Here's what I want the first sentence to say:
"Smoke barriers shall be provided in Group R-2.1 to subdivide every story with an occupant load of 50 or more persons receiving care, treatment or sleeping, into not fewer than two smoke compartments; also provide them at all other stories in an R-2.1 wherever occupant load greater than or equal to 50."

Here's how it is actually written:

420.6 Smoke Barriers in Group R-2.1​

​

Smoke barriers shall be provided in Group R-2.1 to subdivide every story used by persons receiving care, treatment or sleeping and to provide other stories with an occupant load of 50 or more persons, into not fewer than two smoke compartments. Such stories shall be divided into smoke compartments with an area of not more than 22,500 square feet (2092 m2) and the distance of travel from any point in a smoke compartment to a smoke barrier door shall not exceed 200 feet (60 960 mm). The smoke barrier shall be in accordance with Section 709.​

Here's how I'm afraid it reads:
Provide smoke barriers at:
- every story used used by persons receiving care, treatment or sleeping, regardless of # of occupants.
- also provide them at all other stories in an R-2.1 with an occupant load of 50 or more persons, even if they stories aren't used for care, treatment or sleeping.