Make type-expand-based code work on SBCL again.