Note that there are new keywords in these, etc. Matej, would you be interested in going through and patching routers.c, config.c, etc, so they're cleaner? svn:r19