[cs] more whitespace generation fixes