arg-count and reverse-search prompt improvements.