More cleaning up of the duration code
Preserve numerator and denominator for scaler elements