Support h2
Move to using h2 for all non-title headers.