Bring simulator up-to-date with current resync code