Tidy up *CFLAGS usage