gfx_macros fixes, and example fixes

Fixes the gfx_macros issue (though, to be honest, I don't know why this fix works and the other fix didn't- I just lucked out) and updates the examples to the latest nightly.