Small tweaks to support make CXXFLAGS=...