This just made me realize that things are back in stock regularly again. I suppose it happened slowly so I didn't notice, but shortages seem to be totally gone and things are back to 2019 stock levels.