Applied Araq's suggestions for c2nim