More global changes.  It compiles and doesn't crash; but, it doesn't compile either.
WyBS: bug fix for standard rule ...
WyBS: bug fix for the standard build rule.