LP1378355 - Reduce memory consumption slightly.