Minor tweaking of tabulate C code