Cosmetic changes as requested by rleigh.