Address WG feedback from #1074