More work on configuration stuff.