identified that this appears to be a Java 8 regression (non-repro. on
Java 7), and work-around moved higher up for clarity.

Signed-off-by: Michael Vorburger <mike@vorburger.ch>