Simplify code so it will build under Java 8.
Simplify code so it will build under Java 8.

Migrated from Sable/mclab@c30de7b194e3f6797da586900163dff4e66c5d10

Sable/mclab-core,Sable/mclab-core,Sable/mclab-core,Sable/mclab-core,Sable/mclab-core,Sable/mclab-core,Sable/mclab-core,Sable/mclab-core