More work on using empty_str.  I also found a bunch of small todo items.