Remove deprecated should syntax [finishes #43692899]