Nice job in cleaning. Just one more minor nit since we only have one new view states, can you also rename this to singular `_convertToNewViewState` and update the callback argument in `convertPreferences` call below?