waf: move around some flags