More point optimizations.