s4: Use same function signature for convert_* as s3.