A little cleanup work. Still needs a configure script.