Updated BuiltinMap & Set to address a nasty bug.