Simplify bundle config reader. (part 2)