Code review feedback (to be squashed).