Remove 'WITH_' from macro definitions - makes them shorter and quicker to type