Optimize for size even more