Updated to match Lambda-expression supporting changes in vanilla ObjectLayout project