Fix incorrect handling of incomplete completion.
Indentation got munged, fix it.
Merge branch 'fix-partial-completion2' into devel