Reformulate with-clause

This should fix https://bugzilla.redhat.com/show_bug.cgi?id=953195