Agreed. I'll just merge this for now. It is less work to keep it.