Move declarations around a bit