Minor performance-based modifications.