Whitespace changes. Debug defines refactored.