Add support for aggressive filtering for var-length expansion