Get rid of conditional datarefs in config files
Replace with expression language (works only for reading, but that's the only current use case)