Disambiguate between shallow/history states