Minor fixes: indentation, using hasSuffix:, asserting variant group existence)