If you are going to town on that (thanks!), go ahead and make a separate pull request. It makes things easier to review.