let
addq q i =
add (mk_singleton q) i