Actually implement overscan keywords in patch_headers
Actually eliminate glob (*) import in patch_headers