Fix compile problems with zwoop style - deleted code compiles cleanly.