Move a few placeholders for functions

Two functions that seem they will live better in a new file when they
exist.
Revert "Move a few placeholders for functions"

This reverts commit 0120a5a3eb5d43edcadc59cf9d29adccf21e1043.
Because.