Possibly unstable commit before doing major changes to the vao
reference-system.