remove DefUpvar from path matching; we're not doing closures yet