Move cyclic constants into the same file.
Created by: efritz
We were sending -NaN to gitserver because the import order was all messed up between commits and xrepo files. This doesn't fix the cyclic dependency, but does ensure that both constants are actually defined as numbers.