Small helpful additions that came about in some tests.