Split groups expansion methods by type

 * Use type-specific methods when expanding groups
 * Prevent non-matching metrics expansion on groups