Parser changes for top-level binders