Minor cleanup of main.cpp.