Incorporate changes to C flags setup proposed by @avsm.