Slight performance improvements.