Small cleanup around `hippie-expand'.