Build: Minor cleanup

Eliminate duplication of flags which apply to both C and C++
compilation.