Clean and comment cbidris:columnate-arguments