Avoid using irregular control flow in Witness func

When going through serf code (which is generally great btw), I noticed
this specific part could be simplified with regulard control flow
structures. This small change set makes that improvement.