Fixed complaints for Java 1.8
After considerale review, changed the way the convenience scanning classes work.