This should go into waf upstream.