Merge "Clean up style issues in ArraySet."