Improve config.c again :)