Reduce flog complexity score

A number of small tweaks to reduce the flog complexity score, without
affecting functionality.

Before:
   504.4: flog total
     4.2: flog/method average

After:
   489.9: flog total
     4.1: flog/method average