Done.  I extracted a few other methods while I was at it.