3d95c66556
Per Veykril's suggestion, this removes the need to repeat the completion text twice. It also handles the completion in a more general case.