Cleanup marss_sim.

Pull more unneeded function calls out of marss_sim.