just move defines nearer to their useful scope