Split expansion out into its own file.