Trivial rename/code move.

Working towards #293.