Removed some commented out stuff from the non-nan version

Also fixed a problem where empty tag values were not being returned
properly.