Simplify atom interning more