TP6: Again more K&R coding style