Cleanup configuration parser, add 'check-conf' option.