Move some functions around.