[CLEANUP] Use for each.
[BUGFIX] Fix Ant warnings about includeantruntime.
[CLEANUP] Make proper use of Generics.
[CLEANUP] Make private fields final.