Fix: Minor performance improvements.