Tiny change in main.c to use the new typedef'd names.