Improve addition code cleanliness, if not workingness.