Some stashed-in changes.