Hey Stefan, here's a patch with the changes you suggested.

Note that I changed the use of Vminibuffer_history_variable for histvar
in the call to `add-to-history', since the value of
Vminibuffer_history_variable was being restored to its original value
after `read_minibuf_unwind' was called at the end of the function.

Thanks!