Tweaks to worktree_state_dict()

Two changes:  remove some unnecessary set to list conversions, and remove some code that was preventing submodule status from displaying correctly when a submodule had both staged and unstaged changes.  If anyone is able to describe a case where a submodule's status is displayed incorrectly with my change, let me know how to reproduce it and I can make another go at it.