Address review comments, cosmetic cleanups.