more vsllink typedef cleanup