Clean up manual merge changes; tests now pass again.