Compiler suggested cleanup
Beta Simulators (PDQ-3 and SAGE) from Holger Veit