Fix issue with declarations in braces being missed by AST converter