Update after simplifications in app states API.