Made good progress on mutability warnings