Working out whether HVM is actually going to save us or not right now... :)

Until I actually have that answer I'd either wait to commit this or just merge it without mentioning HVM.