[#3241] Minor tweaks to new expression language functions