I kinda super hate these stacks of `end`s, and prefer end staircases. Now that we're out of tab country, would you be offended if I fixed these?

You know what, there are lots of these around the code base, I'll jenga-fy them later.