This should make things easier to change and maintain over time, with the ultimate goal of making it easy to provide example configurations that can be expanded upon.
