Get straight who should be tuple-ifying things

And patch up some whitespace and speeling.