Unify Yellorium and Uranium

Don't need two versions of essentially the same thing, even if it is a
bit jarring to have to be converted to something else...  oh well.