Various updates incorporating feedback from Laszlo Ersek and others.