Fixing the vlong stuff would be nice too, if you have the extra time...