Review-driven changes (to-be-squashed)