@pmatos is this really supposed to fall through into the ShortAccum case? Are there any tests for this code?