Avoid name clashes by commenting out some code (#27).