Add variant integers to buffer item types.  More cleanup coming.