Move ido-ubiquitous around a bit