Bug 10601: (follow-up) improvements to ->set() and ->get()