Only flatten 1 level in push and add to set:

[ fix #3093 ]