Fixes #101.
Minor refactoring in JavaSourcesModelBuilder.