(2C-two-columns, 2C-merge): Use window-full-width-p instead of comparing