A little bit of consolidation.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK8@1600683 13f79535-47bb-0310-9956-ffa450edef68