Remove headers callback and tidy up html module a bit.