Put related functions next to each other

I was going to do something else when I noticed that some related functions weren’t side-by-side.  So I figured I’d submit a nice, easy, “low-hanging fruit” Pull Request. :)