[cs] some more whitespace generation fixes