Cleans up some usage of vm.assume. Will be a series of commits
that do mostly the same thing.