Fix #496: Maintain focus through a row update.

Also added code to clean up focus settings on blur. This was not being done before. I needed it for my update and it seems like a good thing to have in general.