Fixed start/stops to be apropriate save/load-storage method definitions instead.