Some code re-org stuff.