r12623: Another round of fixes for the prototypes of tables.c