OK, now the actually working implicit tuple fix. (sigh)