Moments need to preserve spectral units

This should be merged pretty much immediately... though a regression test would be appropriate.