Update to depend on storemate 0.9.21