Move to a more American spelling of "marshaled", etc.