Some defines cleanup.