More warn fixes, more code cleanup.