That'd be my inclination. I may put that in a separate PR though.