Thanks for merging this down, hoping that the removal of that duplication will prevent future issues of forgetting to update multiple places and stuff.