various minor coding fixes

Fixed comment rot by moving code for `h1` back together with code for other header elements (and thus reuniting it with its long-lost comment).  Made indentation consistent in the same $_formats hash.