Cleanup z-form.c

In vstrnfmt(), merge some duplicated code by combining if statements.

Plus fix whitespace and misspellings in comments.