Restore the ability to easily override the compilers
fix conflicts.