Fix non-existent symbols

[ngharrison]

Update function name from minibuffer.el and macro names from cl-macs.el.