Flyweight improvements.