Merge pull request #673 from danvk/track-code-size