Better separation between java-collections and the Java FFI. java-collections should be easily moved to contrib now.