Revert "Staticfy some methods to make them easier to factor out."
This reverts commit 3c7c370dc731984c771fcd753ac2651787759669.
... because ... nevermind.