Fix a number of issues with generation handling and support tripping of items in parentheses.