Miscellaneous minor cleanup or minor improvements, mostly from Vicky.