Patch from Nicolas Pitre

Reduce code duplication.  Resulting assembly is identical.

Signed-off-by: Nicolas Pitre