Fix username not appearing in replies.
Clean up some code