Makes it better for preferences.

Consistency? what for?

And other simplifications

Thanks to jb.