Future: some fixes re: handling of universal references