But function definition uses "pSFrom" instead anyway, so consistently use param
names from definition in declaration.

Change-Id: I03fb8dd0fbab5c84f89c7276849d62f9a17cbfea