[css-counter-styles] Preprocessor fixes.
[css-shapes] Fixed basic shape grammar to use comma separators