Fix z_info->max_titles, code cleanup

The important fix is in init2.c.  The rest is just cleanup.