Parse dict comprehensions, cleaned up comprehensions, cleared testlist_comp out of expr->ast and cleaned up atom forms a bit