Make it work with DVTiPhoneSimulatorRemoteClient + a bit of code cleanup