C support and tabularize improvements