Merge "ART: Further refactor use lists"