DEP-37 - now works for ~99.5% java files