I thought about a lot of things like that, but again I'd rather do that in separate commits.  I can see how this diff is misleading given all the green lines but it's really all just the same code that was there before.

My concern with doing it in this commit is that the entire code base tries to be forgiving to invalid values. That's not really my coding style but I'm concerned that invalid values have already slipped into the backend stores and that any validation will actually cause crashes in production. It's unfortunate that the values are not validated when you enable a feature.