Got rid of unused true/false defines.