r9240: rework to avoid some sbcl optimization notes