Get rid of the common syntax, since it's not used.
tweak header context
Merge pull request #31 from mnot/master

Remove the common syntax