Agreed. I'll create a work item to track this so we can redo all of these in the near term to match.