Fix code smells

[pondermatic]

Found and fixed issues that are considered code smells:

• method calls with mismatched number of parameters
• inconsistent return points in methods with missing return statements

[pondermatic]

I found some more calls to JWS->setPayload() that need fixed.