Cleaning up javalib, and ensure no unexpected types slip through the readers