This simple migration with the bare minimum of changes necessary solves compatibility issues with Java 9 build environments.