Fix Clang static analysis errors

This covers #459 and #460.
Same here. It's clear that these are the two formats I originally worked on, but I still don't think the absolute positions are better.