I quite enjoy visiting the Mission Hill Winery in the Okanagan. Fantastic architecture, not to mention some pretty decent wines as well. When photographing architecture, straight lines really should be kept straight for the most part. Very few lenses, save some very expensive and highly corrected ones at that, are capable of achieving these perfectly straight lines. A fantastic tool that is available for a very reasonable price that helps tremendously is from a company called ePaperPress called PTLens. This software corrects lens pincushion/barrel distortion, vignetting, chromatic aberration, and perspective. I use it extensively for architectural photography, but also for nature images where relatively straight lines like trees, for instance, need to be corrected. It makes all the difference in the world to have no barrel distortion visible in an image, and PTLens eliminates it better than any other software I have come across. It even corrects the barrel distortion from many point and shoot cameras, rendering a very professional looking image.
Below is a quick comparison as a before and after. Left image has not yet been corrected using PTLens, nor has it been converted to a grayscale image and toned. For me it is most definitely worth the price and tiny bit of extra effort in order to achieve a far better quality image.