Per discussion in [1], we don't need to strip relabel for the expr explicitly before calling pull_varnos() to retrieve all mentioned relids. pull_varnos() would recurse into T_RelabelType nodes.
Add a patch to remove that and simplify the code a bit.