Reorganise cflags a bit