Fix incsearch-cmdlinecomplete conflict.
Package reordering.