#1041376 by moshe weitzman. --simulate does nothing for remote dispatches. Also lots of trailing whitespace removed.