Fix Clang static analysis errors

This covers #459 and #460.
I always liked this format better. It's more clear to me how does the header data look like. Is there a particular reason for replacing it?