Ok, sorry for the confusion @bpezan, I (already) forgot about the legacy format, so I totally misunderstood what this part of the code was doing.

Anyway, I agree with @untergeek, there's little value in maintaing backward compatibility here.