Update for new expectations of arguments to NumPy.hstack()