Changes required to support more recent vstruct (use of 'local vstruct = require ..)