Hey Drew, Stefan,

Thanks for both your responses. I've attached the same patch with the
simplification suggested by Drew. Whomever applies one can pick which
they prefer.