Restored config prefixing and one-lining.