Header-related fixes for Twee

In the recent header-related changes, Twee got broken. These commits fix things such that both Twine and Twee work with the new header support.