Cleaned up some apparent merge issues.