I would prefer these to use the long values already, since those are the values actually used.