Sure, I agree. Mind if we leave as a future issue though, after merging? It's a bit of a time consuming change.