Cleanups.
Switch-a-roo to generic string id in SimulatorObject.h instead of seperate ones. @yotamdikstein