Tweak per @thisandagain feedback