Christian Sibo

Here's a solution that doesn't require overriding the header slots. That solution wasn't tenable for me because we were already doing a lot of work on the headers and didn't...