Even more clean-up. (#135)