Code coverage (cleanup based on PR comments)

This just does some cleanup based on comments in https://github.com/fog/fog/pull/1897.  It doesn't make any significant changes.