140427-iss003: remove {add,remove}_{row,col} and add {add,remove}_rowcols, add merge_{row,col}