whitespace check not working

We noticed when looking at a diff that the s_whitespace script was not stripping trailing whitespace consistently. Fix and simplify.