Config file PR cleanups.