Adds more little optimizations