More FP avoidance and other tweaks

git-svn-id: https://svn.apache.org/repos/asf/spamassassin/trunk@1607893 13f79535-47bb-0310-9956-ffa450edef68