[v2.2]Cascade skill issue

[Kilgs]

I keep bumping my head against an issue in Cascade Skills. This would be for v2.2.

Do you add ranks to the different cascades before/during/after character generation?

Example:
Bob goes into law enforcement in first term. He receives
-Small Arms (Pistol)/2
Now, this should also give him Small Arms (Rifle)/1 according to the rules.

Second Term, Bob then enters the Army and receives
-Small Arms (Rifle)/2

If we add the Cascade level at each stage, Bob would have…
-Small Arms (Pistol)/2
-Small Arms (Rifle)/3 (1+2)

I assume since Pistol is higher than Rifle at the time of adjustment, we don’t add a +1 to Pistol also.

Third Term, Bob decides to increase Small Arms (Rifle) to /5
-Small Arms (Rifle)/5
-Small Arms (Pistol)/3 (2+1)

That gets really confusing. So how do people do this…?