Move more software-I-use to toolshelf catalogs.
Minor fixups to the C99 node.