Ah - the other one has the same simplification.  Perhaps cherry-pick the commit from @notspiff and pop the cleanup/simplification on top?