Better handling of scalars to plt.subplot(). Fixes #880