Thanks @dcarley! I much prefer this and it works as before; I've included a test for this explicit case now). :egg: