The continuing cleanup of misc.c