Reading the headers differently
I think this is the proper way to do it - I can grab values and comments
(where they exist) just fine.
The previous commit was meant to be for test.py, but it didn't seem to work
that way.