Patch #523268, #522027: return enhanced tuples.
3 files changed