Optimize cl-struct-slot-value; fix test