Fix XS style to be like C style