Removing Java7-only library calls from 0.5