Work on #391 - mostly removing extraneous commas. (sigh)