merge several improvements in border collapsing code