Reconcile more stuff in predefined.c.