Merged Alex Schroeder's header-filling patch. Thanks!!