This is a good normalization to make. I vaguely remember when adding this function that I was thinking, "hm, that's not right, but it's not like we care about memory leaks anyway so...". Thanks for fixing my laziness. Merged.