Prepare for snapshot

Modifying the stdlib requires a working snapshot, this commit fixes
everything needed for a snapshot, snapshots are wonderful.