Update to newest snapshot, including a few changes stemming from this.