Prevent version ranges from doing stupid things; fix moved var.