Merge changes to configfile.h from c-implementation branch