Improve support for configurations with or without file prefix.