The first bit still doesn't seem to me to add much so I just went with the second half of zamnos's suggestion above.