Ok, these will break my nightlies.  I'll try to go fix those for now, but I'd love for an alternative solution.... hmm...

Can we reference "set-version" from "uri?"  I'll try that out.