Move local types to body