Housekeeping in waf scripts