Cleanup sweep, we can now use more of the std fptools build system
machinery in here.