Code review cleanup (to be squashed).