Tweak r44534: simplify this