Some refactoring; added snippetgroup|hasequals?