Give h2's some more space. Fixes #3838

Also replaces and closes #4103 -- thanks @Iaincal!