Merged var.h and varset.h from SVN head