s4-waf: updated for new perl subunit options and filter name