MOAR workarounds for CMM now being Makefile-less (thanks ether...)