Rearrange methods.
Update to Java 8 b113.
Trade a big warning for a small one.
Remove an unnecessary type parameter.