Fix unexpected {rhs} recursive mapping