Thanks for #1643, it makes life easier. :-)