Good point, I'll punt this change to another PR.