Merge back some registering macros in all*.c.