This is better structurally and it also fixes a linker error in the configure build. llvm-svn: 245052