Minor reordering of functions

Summary: This seems somewhat neater to me, YMMV.

Test Plan: N/A

Reviewers: epriestley, Blessed Reviewers

Reviewed By: epriestley, Blessed Reviewers

Subscribers: epriestley, Korvin

Differential Revision: https://secure.phabricator.com/D10468