Fix the build. Always 'make clean' before committing after major refactors.