Merge pull request #17107 from vasslitvinov/use–if-var
Add uses of if-var in modules
This adds a couple of uses of the if-var construct in the modules.
These are the changes that I withheld from #17047 in 391973eae0
to avoid impact on testing at the time.
r: @mppf as part of #17047