Internal changes

The move to J2SE 5 has enabled a number of internal changes: