And switch over the GenericTag to using it. Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
And convert the unit test while we're at it. Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>