Morse: Some cleanup.