Simplify height stuff

The more we can avoid hard-coding heights, the better.