Fix possible infinite formatting calls

Waqar Ahmedrequested to merge
work/fix-format-infinitely into master

Merge request reports