Width is not height.

I'm only doing this (and giving a sneak preview on the next commit in
the process) because I feel like it would be criminal to leave it unfixed.