A few vectorizations to improve performance