Clean up errors (give them real types)