in merge: - with_ctxclass_instance_attrs now succeeds due to d1387d74 - merge ~conflict in LangPrimitive opcodes