Address code review comments (mostly cleanup).