Bug 6771: Problem with typedefs nested in augment