Small fix, followup to last checkin.

Also, checking in the setup file I've been using for a while...