fixup SI-8118
fixup sane semantics for companionSymbol
fixup SI-8118
fixup SI-8118
fixup sane semantics for companionSymbol
fixup SI-8118
fixup SI-6931