Simplified storage sync some more. Todo: Fix yes-all, no-all