Better last PropertyGroup detection + better F# support