Part of the patch from bug #4301; clean up our prototypes, a lot. Still