Tidy a bit in preparation for docs update.