Merge config file parsing routines from the c-implementation branch