Merge Debug into Base. Simplify tangible classes.