Better compression, macro cleanup, use MAX_LEVEL everywhere.