Merge "Fix unquickening in the presence of duplicate methods." into oc-dev