SI-7624 Reduce scope of work-around for faulty ...

... language.existentials warning