Rebarified
dict tuple has been 9 elements long since R13
Upped coverage a bit