Combined removed/added actions into one moved action

See #484