OK, I think I'm going to order these. Now I'm having a sizing panic because I can't remember what size I tried on that fit so well, and as usual for my rectangular frame which size I'd order changes A LOT depending on whether I go by my waist measurement or my hip measurement. I'm thinking I should order based on my hip since they're cut pretty straight. Any advice?