Edits to nesting logic and language strings.