Most of this are a straight replacement with the new versions in tags/track.cpp. Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>