Clean up compiler warnings, use cl-caddr instead of deprecated caddr