Updating arity of Map and Set constructors, per 2014.04.27 draft spec (rev 24)