BUG: Move 0-d array-is-scalar special case into array branch

This should also fix array-likes