Fixed for changed behavior of Labels collections.

Also fixed improper token content with newlines