Small tweak to class and singleton snippets