Make config parsing a two-part affair