Could we move this trim to the `fetchTemplate` level? That way it's easier to override the behavior.