Not-quite-finished new configuration shenanigans, other minor cleanup.