More shader cleanups

Didn't know you can put `_` there, awesome!