Workaround for scan-build false positive.

Also tidy code to be more readable.
1 file changed