Ref #2709: Fix syntax deprecation