I still don't like testing for .shape[1] :)