Fix back-compat regressions. Also, compactify configuration code.