I think is a valid discussion we should save for a later date and a later PR. With the large amount of changes that have gone into this project of late there's plenty of cleanup and other non-functional things to do. I don't want that to hold up this PR.