Upgrade to Waf 1.8.4.