All changes in this file are changing __unicode__ output--not functionally relevant.