Totally agree. Perhaps something for a followup CL?