Tweaks from review K91485

See https://khanacademy.kilnhg.com/Review/K91485 for reasoning behing this change.