Nit: methods of the Simulator singleton should use `this` to refer to the singleton.