Merge branch 'next'

* next:
  chore, clean up debugging output in sdef-twsxml
  minor, don't hand out nick names for symbols with NULL nick slot
  minor, temporarily use last_dsm to communicate whether it's a user nick or an auto nick
  fix, PEBKAC, only strdup the nick if non-NULL