Improved support for LINQ queries with newer runtimes