Fix references to XA states in comments, and remove unused import.
More final variables and @Override annotations.
Add generic types to List and Iterator.