Initial work on rewriting UV computation for more efficient indexing.