Improved handling of 'to:'