Work around issue with multiplying units when one is dimensionless

The issue is reported at astropy/astropy#2377