Beginning to migrate J2SE code out of core.