Remove even more duplicated code.

In retrospect, maybe actually referencing the PR wasn't the best idea
I've ever had!  Can't imagine too many people care about this project.

As a sidenote, I've got a *lot* in that main org file...