Simplifying snapshot storage code. May be a tiny bit faster too.