Debug code rewritten to not depend on ## either