Continuing ongoing warning-fixing work. Still unstable.