Fix alias completion and let the prompt handle itself