Code review updates (to be squashed).