Fix incremental __all__ and tuples in __all__; lp:1241878 and lp:1266446