Changed @:yield to @:wait. Auto completion works well. Promising experiment.
Minor cleanup