I agree that Java can be awkward if you're trying to write using functional idioms.

Still, in case you were interested, I commented on your gist with a potential solution.