Update for changes to handy (removing clazz from RefById)