Tidy up pixel history a bit, move shaders & states into common