Working on my last (I hope) round of edits inspired by this: