Code review feedback (will squash later).