Easy optimizations

Some easy optimizations discovered by a local FindBugs run.
This and subsequent now use string concatenation within the argument to a StringBuilder.