Make tuple construction handling more portable.