WIP: Fix review comments, and some nits.