I'm particularly concerned about this line of change. Can you review it, @githubteacher ?