Fixes #11871: commas last