Refactor the bundle keys by adding a defaultable version (kind of the opposite format from Prefs