Fix #111: Trim internal mappings instead of letting them grow endlessly
Merge pull request #116 from pitrou/fix111

Fix #111: Trim internal mappings instead of letting them grow endlessly