This has been rebased, now that the SampleGrad changes are in - I also updated samplelod-xtra, but the swizzle commit is still stashed away since it sounds like that needs to be worked on some more. Either way, this should now merge cleanly without any added MRs underneath!