Breaking out Wishlist.  Not *certain* that it's meaty enough to be
broken out, but it's always easier to collapse it back in later.