CLEANUP: set((, )) -> {} + pep9 when possible