Fix build issues, update refs again.

  * Merge latest commits from angrylion.
  * Apply micro-optimizations to the VR4300.