Few slight performance improvements.