Undo recently introduced change to interval multiplication - that change
was incorrect.  Instead, adding extra cases for some
combinations involving a consistent interval.  Also making the
multiplication code a bit more readable.