conj-columns and conj-rows renamed to join-columns and join-rows respectively