Re-organized declarations.