This looks simple enough now.  Discussed with @adschellevis.

(cherry picked from commit 1d73b3b5)
(cherry picked from commit ab4f67c8)
(cherry picked from commit 47c3fee7)
(cherry picked from commit 3947fff4)