fixing java 7 support. 

Lamdas are too tempting...