Merge "Minor clean up to install.cpp."