Merge "Add support for removing structs that cross blocks."