Following suit with PR #828, this change cuts down the expenses from using .To doubly; yet using the Go in-condition variable idiom. Updates #826