Fix a number of issues compiling on a recent -CURRENT due to some
vm_* function name changes.