Many small improvements to c2nim