Cautious patch, which would handle cases where caddr is appropriate, if
there are any: