Simplify group structure code.