Fixed up byte-compiler warnings about floating variable references;
also *possibly* fixed the completion issues that were happening
previously.

It's still buggy and fishy as !@#$.  Mega TODO!