Make some minor edits to the auto-suggest code.