Fixed an actual error present int the SDF2 grammar
Made the Java15 disambiguate filter more accurate

Now it always picks the tree with the most valid casts.