~ Various performance improvements.