I have in my Claude.md that comments must be diegetic, if needed at all. This seems to have helped. And it is then something which gets checked by agents in code review.