Yes, ArrayList should be changed to List, but since I missed that in previous code reviews we should fix it in a separate commit.
I've already done some similar fixes on the 2.11 branch.